bitkeeper revision 1.1159.1.509 (41d2caf2cGsHkns4vKFDopvGUuM4BQ)

Merge

diff --cc xen/arch/x86/setup.c
Simple merge

diff --cc xen/common/domain.c
Simple merge

diff --cc xen/common/kernel.c
index e8053b274c830c51a62caaaf3bd3a15a2c159773,cf47e3214ca21b598aef8d06159a8186cdda7c93..3b562ed7b7c0631a1a4987f3cfce475331feb2e2
--- 1/xen/common/kernel.c
--- 2/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@@ -297,9 -75,10 +75,10 @@@ long do_xen_version(int cmd
      return (XEN_VERSION<<16) | (XEN_SUBVERSION);
  }
  
+ vm_assist_info_t vm_assist_info[MAX_VMASST_TYPE + 1];
  long do_vm_assist(unsigned int cmd, unsigned int type)
  {
 -    return vm_assist(current, cmd, type);
 +    return vm_assist(current->domain, cmd, type);
  }
  
  long do_ni_hypercall(void)

diff --cc xen/drivers/char/console.c
Simple merge

diff --cc xen/include/xen/domain.h
Simple merge